220. Araxis Merge File Comparison Report

Produced by Araxis Merge on 2021-05-13 09:09:03 +0000. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

220.1 Files compared

#LocationFileLast Modified
1/Applications/Ampps/www/Porto 3.2.2/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Checkout/web/css/source/module/checkout_estimated-total.less2016-05-11 16:08:02 +0000
2/Applications/Ampps/www/Porto v4.0.0/Theme Files/Magento 2.x/Porto Theme/app/design/frontend/Smartwave/porto/Magento_Checkout/web/css/source/module/checkout_estimated-total.less2021-02-04 02:52:06 +0000

220.2 Comparison summary

DescriptionBetween
Files 1 and 2
Text BlocksLines
Unchanged5122
Changed118
Inserted00
Removed33

220.3 Comparison options

WhitespaceConsecutive whitespace is treated as a single space
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersNot shown in the comparison detail
Active line-pairing rules

220.4 Active regular expressions

No regular expressions were active.

220.5 Comparison detail

1 // /** 1 // /**
2 //  * Copyright © 2015 Magento. All rights reserved. 2 //  * Copyright © 2015 Magento. All rights reserved.
3 //  * See COPYING.txt for license details. 3 //  * See COPYING.txt for license details.
4 //  */ 4 //  */
5  5 
6 // 6 //
7 //  Common 7 //  Common
8 //  _____________________________________________ 8 //  _____________________________________________
9  9 
10 & when (@media-common = true) { 10 & when (@media-common = true) {
11  11 
12     // 12     //
13     //  Checkout Estimated Total 13     //  Checkout Estimated Total
14     //  --------------------------------------------- 14     //  ---------------------------------------------
15  15 
16     .opc-estimated-wrapper { 16     .opc-estimated-wrapper {
17         &:extend(.abs-no-display-desktop all); 17         &:extend(.abs-no-display-desktop all);
18         &:extend(.abs-add-clearfix all); 18         &:extend(.abs-add-clearfix all);
19         .lib-css(background, @checkout-step-content-mobile__background);    
20         .lib-css(border-bottom, @checkout-step-title__border); 19         .lib-css(border-bottom, @checkout-step-title__border);
21         .lib-css(border-top, @checkout-step-title__border); 20         .lib-css(border-top, @checkout-step-title__border);
22         .lib-css(margin, -21px -(@checkout-step-content-mobile__margin-s) @checkout-step-content-mobile__margin-s); 21         .lib-css(margin, -21px -(@checkout-step-content-mobile__margin-s) @checkout-step-content-mobile__margin-s);
23         padding: 18px 15px; 22         padding: 18px 15px;
24  23 
25         .estimated-block { 24         .estimated-block {
26             .lib-css(font-size, @checkout-step-title-mobile__font-size); 25             .lib-css(font-size, @checkout-step-title-mobile__font-size);
27             float: left; 26             float: left;
28             font-weight: 600; 27             font-weight: 600;
29  28 
30             .estimated-label { 29             .estimated-label {
31                 display: block; 30                 display: block;
32                 margin: 0 0 @indent__xs; 31                 margin: 0 0 @indent__xs;
33             } 32             }
34             .estimated-price { 33             .estimated-price {
35                 color: @theme-color; 34                 color: @theme-color;
36             } 35             }
37         } 36         }
38  37 
39         .minicart-wrapper { 38         .minicart-wrapper {
40             float: right; 39             float: right;
41                 
42             button { 40             button {
43                 // todo ui: Change .action.showcart to .action-showcart 41                 // todo ui: Change .action.showcart to .action-showcart
44                 &.action.showcart { 42                 &.action.showcart {
45                     .lib-button-reset(); 43                     .lib-button-reset();
46                     height: auto; 44                     height: auto;
47                         
48                     .counter.qty { 45                     .counter.qty {
49                         left: 0; 46                       right: 9px;
    47                       top: 3px;
    48                     }
    49                     &::before {
    50                       content: '\e8ba';
    51                       font-family: 'porto-icons';
    52                       font-size: 27px;
    53                       display: inline-block;
    54                       color: #222529;
    55                       width: 40px;
    56                       height: 40px;
    57                     }
    58                     &::after {
    59                       margin: 0;
    60                     }
    61                     &:hover {
    62                       color: #777;
50                     } 63                     }
51                 } 64                 }
52             } 65             }
53         } 66         }
54     } 67     }
55 } 68 }
56  69 
57 // 70 //
58 //  Desktop 71 //  Desktop
59 //  _____________________________________________ 72 //  _____________________________________________
60  73 
61 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) { 74 .media-width(@extremum, @break) when (@extremum = 'min') and (@break = @screen__m) {
62     .opc-estimated-wrapper { 75     .opc-estimated-wrapper {
63         display: none; 76         display: none;
64     } 77     }
65 } 78 }